From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 24 May 2011 17:24:58 +0000 (+0100)
Subject: libxl/xl: Use "firmware" rather than "hvmloader" in API.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10301
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=160b1835d29998df94de1f181edec7479c45eb5a;p=xen.git

libxl/xl: Use "firmware" rather than "hvmloader" in API.

23251:0710f53cef4a turned build_info.kernel into
build_info.hvm.hvmloader however this is a rather specific name for a
field which may be used to load things which aren't hvmloader in the
future. Switch to calling the field and associated configuration itmes
"firmware" instead.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl.idl b/tools/libxl/libxl.idl
index f0fb22f5be..acb34d48d0 100644
--- a/tools/libxl/libxl.idl
+++ b/tools/libxl/libxl.idl
@@ -160,7 +160,7 @@ libxl_domain_build_info = Struct("domain_build_info",[
     ("hvm",             bool),
     ("u", KeyedUnion(None, "hvm",
                 [("hvm", "%s", Struct(None,
-                                       [("hvmloader", string),
+                                       [("firmware", string),
                                         ("pae", bool),
                                         ("apic", bool),
                                         ("acpi", bool),
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 62294b26b7..cf8b0e5a04 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -85,7 +85,7 @@ void libxl_init_build_info(libxl_domain_build_info *b_info, libxl_domain_create_
     if (c_info->hvm) {
         b_info->video_memkb = 8 * 1024;
         b_info->hvm = 1;
-        b_info->u.hvm.hvmloader = NULL;
+        b_info->u.hvm.firmware = NULL;
         b_info->u.hvm.pae = 1;
         b_info->u.hvm.apic = 1;
         b_info->u.hvm.acpi = 1;
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index f6bca7efb7..c34f1ce071 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -269,11 +269,11 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid,
     return 0;
 }
 
-static const char *libxl__domain_hvmloader(libxl__gc *gc,
+static const char *libxl__domain_firmware(libxl__gc *gc,
                                            libxl_domain_build_info *info)
 {
     return libxl__abs_path(gc,
-                           info->u.hvm.hvmloader ? : "hvmloader",
+                           info->u.hvm.firmware ? : "hvmloader",
                            libxl_xenfirmwaredir_path());
 }
 
@@ -289,7 +289,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
         domid,
         (info->max_memkb - info->video_memkb) / 1024,
         (info->target_memkb - info->video_memkb) / 1024,
-        libxl__domain_hvmloader(gc, info));
+        libxl__domain_firmware(gc, info));
     if (ret) {
         LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, ret, "hvm building failed");
         goto out;
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 159677a110..b7362af219 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -337,7 +337,7 @@ static void printf_info(int domid,
     printf("\t(image\n");
     if (c_info->hvm) {
         printf("\t\t(hvm\n");
-        printf("\t\t\t(loader %s)\n", b_info->u.hvm.hvmloader);
+        printf("\t\t\t(firmware %s)\n", b_info->u.hvm.firmware);
         printf("\t\t\t(video_memkb %d)\n", b_info->video_memkb);
         printf("\t\t\t(shadow_memkb %d)\n", b_info->shadow_memkb);
         printf("\t\t\t(pae %d)\n", b_info->u.hvm.pae);
@@ -748,10 +748,10 @@ static void parse_config_data(const char *configfile_filename_report,
     if (c_info->hvm == 1) {
         if (!xlu_cfg_get_string (config, "kernel", &buf))
             fprintf(stderr, "WARNING: ignoring \"kernel\" directive for HVM guest. "
-                    "Use \"hvmloader_override\" instead if you really want a non-default hvmloader\n");
+                    "Use \"firmware_override\" instead if you really want a non-default firmware\n");
 
-        xlu_cfg_replace_string (config, "hvmloader_override",
-                                &b_info->u.hvm.hvmloader);
+        xlu_cfg_replace_string (config, "firmware_override",
+                                &b_info->u.hvm.firmware);
         if (!xlu_cfg_get_long (config, "pae", &l))
             b_info->u.hvm.pae = l;
         if (!xlu_cfg_get_long (config, "apic", &l))